Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 22:46:56 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 22:46:56 +0000 (22:46 +0000)
commitf0926d0790ef901af3877af4cc2671f6c71b2355
tree8134c30580025ec4392de7d522563a485a45d8cf
parent54a50fc263b8f6e3f48d7caba5860fe6690c5492
parentf59abafd7e39a1dd4b71d2f72707eafc7565d34d
Merge from mainline.